TST: Expand testing cases.