Merge "Fix broken tests of ApplicationsStateRoboTest"