Bug 17501: Additional polishing (POD, unit tests)