Updated tests to reflect recent changes. Not yet completed.