More tests for artifact package + fixing previous borkage