Fixing broken compilation and adding new failing test to work on.