updated tabledefs and testing with loaddata