I broke some tests, fixed them here