updated Test
added TODO
temp fix