Started to setup of test scenario for SC.
Minor bugfixing.