Fixed more bugs in Manger Test driver that caused null pointer exceptions