Extended tests and fixed field tag for the values

Added a test that fails on the old situation.
Extended check to also check for tuples.

(git history should be ok now)