Unit test post-clean-up fix