Test cleanup – did away with problematic "test" global and explicit need to teardown (now done automatically).