Update test code, use one spec file and test mechanism
Merge branch 'tutorial-test-code'