Starting work of putting tests in their own files.