Minor change on 'test handler'