Moved tests around to reflect changes
Paying all my code debts
!