Removed haskellpackage, added test script, CPP.cf is augmented Mini.cf