Fix indicator transitions and add test