Added more tests for recent bug fix