Remove tests, reworking them.
Start restructuring of tests.