Add @arg decorator and moar tests