Flesh out some tests