Tests passing

Tests are passing, need more extensive testing and Python style
conformance.