Added ability to override tests