add test
simplify few code
replaces schema
Merge pull request #36 from qpautrat/feature/schema_replacement

Feature/schema replacement