Add todo around tests