fiddling with tests, just for fun
Merge branch 'feature/mo4ar' into develop
layoutified and tested