Added tests and updated based on exlibris-aleph refactor.