Added CFG class tests