Completed test fixes