Fixed broken tests that should have been staged in last commit