Improve manager tests