Removed the use of faker and fixed tests