log fixes, adding end-to-end testing