Reorganise specs to isolate options