Bunch of test work
Move tests around so they're together
Refactor method call for better test readability