iteration B2: validation + correcting functional tests