more tests, passing them now