More tests, including heap benchmarks