Added some tests, broke some things