Add more tests, moving to their own file.