Feature/gh52 refactor and test review#53

BenjiMilan merged 8 commits into

developrdkcentral/sc:developfrom

feature/gh52_refactor_and_test_reviewrdkcentral/sc:feature/gh52_refactor_and_test_reviewCopy head branch name to clipboard