Fix tests; fix static method access
Fix chucking to instance methods