Added some test diagnostics