Implemented table section mapping and moved mapped classes into test package to remove external package dependencies in test code.