Try to get unit tests to function again
Merge remote branch 'origin/apache-ref/4.0' into champlain