simplifiy and fix jittests

Addendum to your PR #536