fixed tests + DRY