Non-arc test project, some fixes for non-arc