Fixed some tests to check input value instead of zone value