Now I've really, properly set things up for the tests