Merge "Fix most of IPTest to use data providers"