Fix missing arg return value
Finish definition spec tests