Merge updated unit tests from develop branch.