fixing more tests
fixing more tests
fixing more tests
all tests pass