Merge "Bug 584: Increase test coverage"