Evn more quotes rewritten, old try-catch-blocks removed from old tests