'Fix' tests for realz