Mass Upgrade: Upgraded tests and small refactoring