updated tests
yay more tests (and minor modifications based on the failures)