Made manager test files more robust.