Refixed unit tests, should pass all now