more test modifications