Add Array Term test and clean up.