Added some more test code
removed tasklist