Those need to be class methods
Uncomment some of the old source spec tests