Replace the use of TestManager with make_test_instance to get an instance of the type of manager expected. The old TestManager class is deprecated Change-Id: I717c0296bf8ae07b1dad8f0045bfe12c8620ad0a Partial-bug: #1273455