Failing test fixes