Refactor tests #4583

TestProject