Removed double quotes
Fixed test step
Minor other changes