Fixed up 2 tests
Updated test expectations and everything looks good
Cleaned up legacy files