Corrected some small errors in failing tests so that they now pass.