More testing logging and fixes