Fixed bug where OOV character wasn't counted in NGram vocab.
Updated naming and simplified unittests.