changed check, updated tests