Fixed package so tests pass.
Added rmdir to package.