Merge "Fix test when running with ROBOTEST_FILTER option"