Refactored fuzzy_test, started working on matcher