Fixed some test failures (plenty left)