I ruined this test - fixed
Merge branch 'fix/test-fail'