Fixed tests for great good!