Added custom Manager and tests.