Added unit testing todos