Refactored and Functional Testing
test