finished a few more service app scenarios, refactored a few things in sptest flows.