Refactored NSObject-related modules and specs