Removed erroneously included test suite.
Fixed another shichi/nana sort of bug.