Enhance unit tests. references #2273