Start refactoring test example (remote layout)