Tweaks for first set of testing.