APOLLO-3179 Added tests for alias
APOLLO-3482 Updated group annotations