Test improvements

Some improvement in testing/packaging