Tests: pulled latest changes for tests from master.