Make the specs pass

Signed-off-by: Sam Phippen <samphippen@googlemail.com>
Break up a monster line in the mocks error generator

Signed-off-by: Sam Phippen <samphippen@googlemail.com>