Provide tests based largely on @whoughton's work in #81