Add Manager and Tests