Fix some typos, test that counts are updated