changed some language keys
removed unused strings
cleanup test classes