Adding more integration tests
Adding some more integration tests
Updating integration solution and tests