Fixing test issues, still getting a NameError on the non instantiation test