minor clean-up to test code