updated tests per comments