Fixing gremlins tests, and renaming test main file to match other naming conventions