Last test fixes