add more diagnostics to the test
add tests