Deleted unnecesarry decorator & updated docs and tests