Updated tests
Updated managers