updated ch2
updated tests generated by roo