Update decorator

-Fix how we handle decorator args
-Add decorator tests