Fix test fixture to use version that does not accidently bust cache
Refactor function with tapValue util