added %{..} placeholder syntax and fixed some broken tests