updated tests to reflect recent changes.