MYLOC-144 Updating controller events and tests.