Making specs more robust