New tests
Better alternative handling
Removed cruft from Parser.cellmatch() function