renaming function in test, stylistic changes