Added several cases for critical XS bugs