Add tests and fix some problem with quote