remove some dupe tests, add a couple that weren't there