Updated tests / package.json / structure