More changes (remove db call in suites)