updated tests to match current code