More test coverage. Fixed references to class methods inside of instance methods.