table2: unit tests up, bugfix