Added new tests, should fix #1023,#1022