Update todo: need to add tests