Fleshing out WordTest a bit and adding SAP and SAPTest