Add eliminate repetition of mock assignment