SControl test cases
Merge branch 'master' of https://github.com/dee-m-dobrev/psd-sprint