Corrected table defintition and enabled unit tests.