HelperTest clean up