refactored and added two tests to manager.test
removed unused code