Testfix
Cleanup...
- Re-organization
- Tests gone green…
Cleanup