fixed test
Merge branch 'proto_data_layer' into paramserver