fixed testing support issue