Model & test cleanup
Upgrading Casper