This way, the package set will be possible to pass without re-importing all the time
- refactor into single file for all versions - improve timing, prevent non-deterministic failures - fix tests for i686-linux