Changed tests from TODO to fullblown; added macron/circumflex cases