more tests and removed duplicates.