Attempt to improve code coverage + UPN support