More tests -- you guys have a looooot of shit to fix