Add update method
Extract setUp and tearDown