updated tests to try to pass - needs more work