Cleaned up bigram model
Fixed tests that shouldn't be failing