Tests will be changing too - didn't clean this up completely!