Substitute double quotes for single ones
Remove should matchers
Add some expect syntax matchers