Split out payload commands for testing
Add payload tests