Moves test work to separate file