V6: Cleanup from comments and added additional unit test for SCMAdmin CLI.