Crediting myself
Tidy up the test structure