Fix FQB and Product Manager unit tests