Additional test and another bug fix