Merge "Additional tests to keep Parsoid on track."