move some tests to Unified

Change-Id: I0ad41671aa43ce609cbade0cd167b4446b915e56
2 files changed