Implement GMMA indicator, some refactoring of unit tests