Add tests and checking for single quote errors