Added integration testing