Some small name changes test refactoring and a bit of a better
understanding of what im building.