Removed double quotes, updated tests and removed some comments.