Fix broken tests and remove some dups