Some cleaning done
Tests updated
Test logging updated
Test updated
Test updated
Delete unneeded
Delete unneeded