Fixed failing tests
All test passing
All test pass. Ready to merge to main.