Adding missing message arguments
all arguments should be camelCase,  adding tests for proper message contruction