Test fixes.

No need to modify activity code to run tests.
Test independend of locale.