Fix for intermittent layer test failures due to use of static class
variable in test code.