Restructured test setup
Removed comments in tests
Added fuzzy.substring matching
Updated test resources