deployment isolation groups and some changes to tests