Make the Manager lighter
Update tests