Adding tests and fixed single qoute problem