Migrate tests to -verify