Adds most of the remaining specs (94% coverage) and cassettes