Basic functionality tests and helpful renaming.