Implemented more cases for integration testing

collated code