Updated TODO and removed expect as dependency