Updated auto-test file after name change
Updated test to fix problems