Adding in support for @prop and adding tests for @prop and @property