Issue 148 cleanup test suite