Refactoring: shuffling things around a bit.
More specs for failures