Restructured bigram tests
Pass instance, not class to context factory
Pass the text file as an argument