adding logs and cleaning Not Found exception
small tweaks in the tests