Add more tests and counts total visit count