Added testing and fixed several small bugs with finding todo items