updated tests, now all passing