Envs tests mostly cleaned up