Integration tests

correct branch