fix drives - drives plural, add more tests and known issues