Moved tests to their own appropriate files.