Make tests better