evenDriver simplifications
fixing unit tests