This adds tests as well, right?