Added log info and improved test