Fixes for 'no six'
Add tests.