Added a couple more TODO tests