Added tests, fixed a bug I introduced, gave matcher higher base memory address