Fixing some typos and adding more spec scnearios