changes in switchmethods for new test database