Remove some unused parameters, fix tests
Rename packages, add repositories, fix tests
Typo