Removing obsolete tests and adding a todo