Use single quotes
Fix bugs. Add more tests