Fix two tests for testnet builds, organize some tests.