Correctly check aux proof of work when blocks are read from disk.
Get tests building with merged mining.