refactored some sptest/service apps step defs