add test code
Merge branch 'jasmine'