Bug fixes, Manager test driver complete