Change enum table to use new Table structure. Remove spring from test dependencies