Adding support for tests