Package updated.
clean up
More tests