Add barrier for local properties unit test and fix some styles