Migrated tests to TestBase2 (for stabilty)