Some minor refactoring, docstring improvements, and another testsystem.