Add/extend some more coverage