More fixes; tests are not yet working
Removed duplicate manager; tests still failing