Added a few more packages
Tweak testing setup further