Testfix
Cleanup...
- Re-organization
- Tests gone green…
Cleanup
Merge branch 'feature/1083-test' into develop