"Fix" some tests
Classmethods take cls not self