fixes for test
Merge branch 'master' of github.com:mmhadwin/mixmarket
last fixes