Fix old tests
Remove tests that don't apply anymore
Fix scheme matcher tests