Bunch of additions for testing

Most of these are additions, but "quotedFrom" is a fix.