Updated for tests on columns exclusion
Updated test database