Remove unneeded comments
Test payload parameter
Add and fix specs