syncing tests with what is on master