Fix tests
DRY