Fixing tests

Moving towards goal of having all the tests pass..