Cleans tests
Whole restructure