More work on MWEL parser and tests