getActive refactored / fix for tests