Add integration testing for real this time