Update to make it possible to set tests