More (still passing!!!) test cases after conversation with FC