Fixed a set of test failures