Adjusting also command line test expected results to new schemas.
Merge branch '0.4'