More TODO notes on unit tests to add