Added support for testing