[#83] Better system properties cleanup in tests