Add support for unit testing