Bug 1254 - Increase unit test coverage