fixing spec tests to handle new option format
- also broken tests from previous work (should run spec more often...)