I'll take a look at this as I get the tests fully working.