Unify robot tests, cleanup