made log path nameshorter
added expecteds
added params for testing