Update test.
Remove six dep.