Added some code and started integration testing properly