Rename test helper function and drop @nottest decorator