Adding more cleanup
Added test files