Added Issue90 and Issue91 tests