Moved tests below the support waterline back into todo.