Make sure only keys that start with dash are cleaned, iterate over entry set, add tests