Revert "Revert "Fixes multiple test trials - first positive results""

This reverts commit f6bddebca2524f4295a1715fd81c4dd296ac9c88.