More tests
Caked it up!