Added some collection tests
Added some todo items