Added integration test
Added unit test
Integration test changes
Formatting changes