Adding TODOs
Starting on edge case tests
Caught edge case for other identifiers