Updated TODO and revamped test