Fixed some test.
Merge branch 'fixtest' into my_branches