Moving the non-test related stuff into a different file, so it doesn't get copied to other tests