Added/rewrote Match tests