Renaming test, plus minor changes.