tests updated
DRY improvements