Reworking how test run to be more amd friendly