Add support for automated tests