Refactor Earmark code, fix tests