addressing review comments
test file updates
test updates for new syntax
thrift gen files