@jcoyne I'll fix up the tests...