Fixed another couple of tests