adding a few more tests and also fixing a bug when the field has a suffix and we call the unmasked method. related #12