fixed some of the tests after the merge