Cleanup: Removed unused code
Tests: Nicer test case output