added tests, removed redundant clean_android_strings cleanup