Update versions and remove Suites in tests