Consolidating crossword methods -- hopefully this does not break everythign. And writing more crossword tests.