All unit-tests now working.
Merge branch 'uts'
Add .coverage to .gitgnore.
Remove completed TODOs.