Adding two more test cases and fixing a bug that was found.