Integration tests enhancements