A couple more unit tests for recent changes