reverted for v1
Updated Integration tests