Renaming unit test snippets and extending documentation/todo