Added faker & more spec