Restructured Tests & Quote fetching