Merge "Shove the tests into a different file"