Merge "Bug 584: Test coverage increase"