Migrated tests to new moth