Slightly improve temporary solution to #7
Improvements to test suite