Make tests match the new behaviour