Refactors the tests into seperate files and creates a new test for linking to related events