Make it work with 1.9.3 (including falcon performance patch) and 2.0

Also, made it easier to run tests, setup benchmarks, etc.