made some changes to the tests
made more tests pass
fixed test conflict