Finished converting no-arg test to use a function