Failing test proving #32
Refactor things and tweak test to correctly pass/fail
Make output of error more useful