Make tests way more robust