final test fixes