Modify for tests

I made some minor test modifications.