Fixed test 011
Merge branch 'fixtest' into my_branches