Refactor tests #4583

I think you dont need to manually search this. This is filled by default.