tests
added matches, began rework of tests