add unit testing support