main.cp: tests updated