Add more Spec command test coverage

More coverage and a minor bug fix.