Merge "removing failing tests"