Tidy up tests

[MichaelClerx]

Change the structure to be

• 1 test class per real class
• 1 or multiple tests per method