Adding test cases for new encode/decode options