First round of test fixing