Updated packages, added unit tests