Fixed erroring tests (with exception of pkg, it looks good)