Refactored some names and re-wrote some tests