Add tests for by-group motion