Code cleanup
Arguments in ServiceLocator
Added some tests
Minor fix in tests
Translation tweaks