Pull a lot of package tests up