Added TODO for more test combinations