fixed failing tests. removed previous bug fix from the citest branch.