Improve test for controller taxi