fixed tests, added matcher to env