Price test done
Merge branch 'local'