Refactor Olid into BookOlid and WorkOlid
Use new version of jUnit integration