Adding support for testing