Multiple regression/future test fixes