Replace the horribly broken toJSON method with toMap
Implement a new layout tests runner
Merge branch 'wip/new-layout-tests' into develop