Resolve two TODOs and add tests