Add support for test