Add tests for wf-sping and refactoring.
Merge remote-tracking branch 'origin/develop' into develop