Add support for testing