More unit test coverage, and implemented long waiting TODO note