Manager class unit tests + refactoring
Added testing section