Added support for optional testing