Add some more tests
Ignore more variants of architectures
Strip & as well
Ignore short words in a sentence a well