Separate unit specs and use better beforeEach