Add more tests based on issues reported by users