Adding in more test cases & 2DO comments.