Renamed manager to helper
Fixed tests