Updated test suite to reflect recent changes.