more test improvements in response to Bryan's comments