Refactored Unit Tests and Integration Tests