enable coverage
make coverage stop complaining about else path not taken
deferred refactor
more specs for mixins/classes
singleton specs