Tweaks to the test program