added integration tests again