Reword tests, add another def