Resolve tests

All tests will now pass