Mostly addition of tests

Sounds like a tough day. :p