Revert collation -> charset in tests