More tests added to todo list.