fixtures/schemas refactoring

Mike Hoang requested to merge mike/minor_refactoring into master

rel to #1061

Edited by Mike Hoang

Merge request reports