Update references and move $fired before to test it.