Made taxmanager more testable