make it unittest compatible
remove comment