Integration tests

It includes the latest upstream code and the integration tests written so far