Moves test code to better reflect location of code under test