|#000| refactoring and adding missing tests to ManageSupervisoryPage