Test cases for already working Issue #97