Fix callbacks and add specs