add testing support