fix a couple more tests and now we're all passing again