Update tests to reflect intended changes
Remove the evaluate option
Do not strip failed interpolates
Change syntax for evaluate