Test failures fixed