update tests; shake out typos