Make types classes, add a test that'll probably fail