some testing completions
Some more todos done.
TODO did done!