db-data tests
DynamicTable Refactored
Refactored a bit
Refactoring