[#200] fix callbacks & add some specs