got the tests working and fixed some bugs