Added "todo" tests