minor changes to Cond parser, and wrote basic Cond and List tests