Fixed potential error in prefetch code
Added notest option to test_versions