removed private methods and fixed issue in GenericTest detection