Small changes
Added manager tests