(COMMIT-35) Removed database dependent tests