Fix stock test.
Finish test.
Merge branch 'feature/Test' into develop