add validator, update tests