Merge "Remove aaa always failing tests"