updated tests, currently 45/47 of all tests are passing