Replace single quotes in app
Add tests