Still testing and upadting the integration tests as well