Update event handling in setup-disguise-test-code page + some refactoring.