Todos should be created at top of list

- Lots of tweaking of test suite to improve acceptance coverage