Fixed unit tests and consolidated into table.unitTests