Fixed some test failures