Merge "Bug 584: test coverage increase"