NCAA tournament set to expand