#337 Added more corner case tests from previous bugs