added TODOs to increase test coverage (currently 84.4%)