refactored tests per Eds guidance