Rewrite logic in property reader, add one spec to property reader spec