Fixed more tests
Fixed more tests

genexliu/NativeScript,NativeScript/NativeScript,genexliu/NativeScript,NativeScript/NativeScript,NativeScript/NativeScript,NativeScript/NativeScript,NativeScript/NativeScript,hdeshev/NativeScript,hdeshev/NativeScript,hdeshev/NativeScript,genexliu/NativeScript