Simplified, fixed packaging, so tests are packaged as main artifact.