modify tests while maintaining coverage

This eliminates a slow test and two others, replacing them with an expression that failed the same way in the old master at 0fa7b9730e56759e5f4bc3752143f5cfd9279f4 as the expression that identified the issue. In addition, all the added code is covered by this expression. It also runs in a couple of seconds instead of minutes.