Add Robots
 Fix minor problem in unit tests.