Fixed parsing of table
Extended self-test
Minor fix