Added tests, corrected typos by the regular expressions and replaced some double quotes with single ones