Completed Tests and Refactored