SOme more tests, add report deletion, remove dead code