Adding a couple of missing tests and tidying completed TODOs