Removed more tests dependent on manifests