fixed tests per @betravis's feedback