beginning to fix tests
still failing, however