New unit tests for recent enhancements