fix duplication bug in creation of mock and remove extra files