Fixed all tests involving non-restriction components and normal Properties managment.
Some issues left to debug with merging Properties and property restrictions.