Made the tests so they at least compile (many still fail, due to changing specs)