Added more unittests to reproduce bug# 9510.