Code cleanup.

Stop using 'should' in test descriptions.
Remove extra lines.
Uncomment old error message case and change it to a pending test.