Change order of prod test
Merge branch 'release/v0.1.3'