Minor modifications to test