Moved tests in to their own files, but maintaining enhanced access.