Readded test fixes