rewrite to use one single list of objects of class 'mock'