Refactor tests to create mapper in context