Slight rewriting of tests