Merge "Remove very, very old disabled test cases and todos"