Resolve test failures