Resolving some test failures