Refactored macro to use ComputedProperty meta instead of object's meta

Tests pass.