Fix some localization and some tests