Added TODO's for my test