Refactored names and added a skeleton test class