Yeah, I wasn't too keen on this, but I was trying to work around having to change all the tests, but maybe I should just change those really.