Merge "remove broken, unused and unwanted tests"