Fixed localization caps + added tests