Merge "Tests for correct decoding when TP-OA contains non-integer information"