fixes last round of tests