Changed Quote and removed some tests that did not work