Changed conditions to isset.
Changed NumberTest, so it doesn't try to change the locale.