Some 2014.7 test fixes