Merge "added encode/decode matching validation to tests"