Prepare merge request for 3.12
This is in order to simplify the 3.12 branch merge
- Simplification of an existing test
- Removed useless includes
Test: just compile and run test/10_db/test_10_db_DBTypesTest
This is in order to simplify the 3.12 branch merge
Test: just compile and run test/10_db/test_10_db_DBTypesTest