
Refactoring into a testable function in order to add further test coverage as well as cleanup the implementation of the main function to be nothing more than a sequence of clear and concise function calls Change-Id: Icbd96609d958197edcb0d5a8f4b1abcd8c7fc1e4