Fixes to tests.xml and packaging