Reworked test structure
Cleanup