More Cases covered in tests