Tightend up authorization and fixed failing spec