Refactor robot setup
Refactor to fix test layer base resolution order