Test failure was due to incorrect test. Fixed.
Added TODOs.
Added better logging messages.