Fix the test manager implementation

Partial-bug: #1273455

Change-Id: I5402d71197979e579a2145f7f775b3e693dccfcc