add new check, remove duplicate tests