Organize xcode project file
Add category tests