Migrate test into test harness