Adjusting expected results.
Further adjusting expected resulst.
Once again adjusting expected resulst.
Merge branch '0.4'