Fix specs
Improve exception text
Add -w option to execute a suite of calls