Updated integration tests. Test suite is green.