Renaming some existing tests and adding some more coverage around the issue that @leggetter was seeing