Cleaned up todos.
Renamed test.