Fixed more failing tests, still a few remaining, still leaving compile error with comment to lead the way