Upgrade regarding PR feedback + small corrections
Update and add tests