Test case for issue #54; refactor issue tests a little
Disable failing test for the moment