indentation & tabularization
cleaned up existing test and added test coverage to test suite
Merge branch 'test_improvements'