Issue #307 Reverts test change