Fix objc unit test glue code, fix indentation