Flesh out tests