Removed TaskTest and some TODOs