Updating unittests & NGrams