Tweak to unit tests - combined beforeEach functions.