Modified structure tests to use interned temporary names. Added beginning of :include option handling.