add new integration tests, correct tests