Made all the changes once again, and it's updated with the new tests :)