Add some nice development gems.
Add missing identifier on mock.
Remove spurious error checks.