fixes tests, makes tests pass