Updated Project
Refactored tests