Minor modifications to 'test'