[MAT-450] Tidy up manifests for tests