Yet again adjusting expected results but also fixtures.
Merge branch '0.4'