Adding TODO for self
Updated simple test output to match new format