use cb everywhere instead of done
Update the tests