Change test-setup to allow testing AT and DX
Start migrating/fixing tests