added cache folder
little cleaning
fixed unit tests