More singleton tests
When superclass isn't a class tests
Merge pull request #1626 from carsonmcdonald/moreclasstests

More tests for Class behavior