Detect already defined properties
Detect already defined properties
Fix spec tests