Do not lose case on save
more robust testing