Switch back to rustpkg test infrastructure

I'm not sure what the right thing to is is wrt use statements.