Adding customer test fixes