Refactor tests #4583

if not used anywhere, remove it