Added manager and tests.