fixed merchant tests and items tests