Some cleaning done
Tests updated