Test failures fixed.