All tests pass, fixed some localization stuff that was making some tests fail