Fixed localization caps + added tests

:+1: for making these class methods