fixed mock object
added tags