Some cleanup with the help of mock creation methods.