Fixed tests for cf04f76