Make tests clearer