A few more changes from javaunittest to unittest;