Minor fixes to Dev Test 3