Fixed test site/groups methods to be less fragial