Add version parameter back to the tests (it doesn't work)
Implement packaging type merge