- New test case is still broken.  But these are some fixes