Refactor tests #4583

OLS after this