Resolves test failures