@bstansberry Does the todo need addressing for tests?