Test fixed
Parser improved. Property detection added.