Merge "minor improvements / corrections in unit tests"