Merge pull request #85 from daniellemayne/develop

added affinity group tests