Add some more testing and rename variables