Modified toasterprovider and  added new tests