More atlas test fixes