updated unit tests to work with merged changes.