Added placeholder support; updated tests