Convention test ALL THE THINGS!
Extracted classes to their own files.