Colspan support and improved tests.