update tests and fix behaviour when prop cannot be extracted