integration tests enhancements