Adds some names, cleans up tests