Add support for tests