Fix typo; Replaced a couple of old cmfplone test suites with new ones