Minor formatting changes
Added a test that 'should' cleanup after itself