Attempted test fixes