Fix and improve some assertions in test_site