Improve Manager tests