Fix unit tests for six support