Add tests to cover Integration Tests