Add post-Merge fixtures and refactor
Test / Run unit tests (pull_request) Successful in 3m42s