Rework tests, implement fix re #32
Make output of error more useful