Broke each test into its own file, and added another test.