Added test-jar to packaging phase
Improved packaging phase.